Messed up the merge conflict resolving.