# Conflicts: # visualiser/src/main/java/seng302/Mock/StreamedCourseXMLReader.java # visualiser/src/main/java/seng302/Model/CompoundMark.java # visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java # visualiser/src/main/java/seng302/VisualiserInput.java