cleaning up merges