Fixed some merge conflicts