Removed random git conflict crap from files.