keeping the merge conflict. do as sindre says!!!