- resolved some merge conflicts.