i want merge conflict