fixed rebasing conflicts