Fix merges