Messy merge of conflicts