fix merges