deleted some merge conflicts