removed some merge conflicts