merge conflict poof