Resolving conflicts after merging with altgen