aftermerge fixing