corrected some merge conflicts.