Resolved some merge conflicts