Removed "<<<<<<<<<<<<HEAD" from line 194