Fixed the rest of the conflicts.
This is the final submission for Clue Board Part One