Removed "<<<<<<<<<<<<HEAD" from like 10 lines