fixed some merge conflicts with master