fixed merge conflict

I'm starting to dislike Git ... merging is much easier in Hg