Correction: Merger Error

removed "<<<<<< HEAD" and other erroneous text.