corrected some merge conflicts.
dummy commit