Octopress init
resolving a conflict
removing everything