Handle merges