save before merge
merge octopress/master
try to merge origin/master
merge origin/master
updates made in home