Trouble with cloning Octopress blog on other laptops/computers. (conflict isseue when git pull origin master)?

This is not an error, it's Git telling you that there's a conflict on a file that it was trying to pull of the remote repository.

I cant really gove you an answer,but what I can give you is a way to a solution, that is you have to find the anglde that you relate to or peaks your interest. A good paper is one that people get drawn into because it reaches them ln some way.As for me WW11 to me, I think of the holocaust and the effect it had on the survivors, their families and those who stood by and did nothing until it was too late.