fix rebasing conflict