fix unmerged changes