Removed The <<<<<HEAD and such from last update