fixed some merge conflicts