fix after merge conflicts