@@ -0,0 +1,189 @@
+package savvytodo.model.task;%0A%0A//@@author A0147828U%0A/**%0A * Enum to differentiate between the types of tasks%0A * @author jingloon%0A *%0A */%0Apublic enum TaskType %7B%0A    FLOATING, EVENT, DEADLINE%0A%7D

resolve merge conflict