Removed random git conflict crap from files.
fixed more conflicts