Resolved some merge conflicts and made other minor changes