fixing rebasing error