merge conflict = fine now