Weird, git wrote onto my Gemfile '<<<<<< HEAD' - removed and went with static-pages merge on file