merge conflict cleaning up