aftermerge fixes