Clean up merges