Fixed merges