Merge Correction

Corrected the merge conflicts.