conflicting changes? but why??

stupid git
damn
Merge branch 'gh-pages' of https://github.com/iqlabs/daddyo-www into gh-pages