cleaning up a merge conflict.