Cleaned up the stupid merge marks