Cleaning up merges again, No clue why it likes to duplicate code...