Octopress init
resolve conflict