Fix merges.