Merge no-op merges