resolved some merge conflicts