solved some merge conflicts