Post about merge conflicts and xml