fixing merges