I want merge conflicts