Zombie octopress theme nullified.
Fixed merge conflict.