solved merge conflicts from rebasing