Octopress init
Site updated at 2014-06-27 18:01:22 UTC
Does that fix the conflict?