Fix merge conflict remains and addm error messsage

Author: totoyoyo

docs/DeveloperGuide.md

@@ -494,18 +494,6 @@ Users would be better able to manage their social and academic commitments by to
 
   Use case ends.
 
-<<<<<<< HEAD
-**Use case: Viewing meetings in the timetable**
-
-=======
->>>>>>> 6b3cdedcdc7d066e766ef5f4d6971efdb9916ac1
-
-New features on V1.2
-5.  Assign priorities to contacts
-6.  Notes about the contact.
-7.  Sort contacts by (priorities/personName/groups)
-8.  Last meetup date for each contact
-
 **Use case: Sort contact list**
 
 **MSS**

src/main/java/seedu/address/logic/commands/meetings/AddMeetingCommand.java

@@ -31,8 +31,8 @@ public class AddMeetingCommand extends Command {
             + PREFIX_NAME + "NAME "
             + PREFIX_START_TIME + "START TIME "
             + PREFIX_END_TIME + "END TIME "
-            + PREFIX_DESCRIPTION + "DESCRIPTION "
-            + PREFIX_PRIORITY + "PRIORITY "
+            + "[" + PREFIX_DESCRIPTION + "DESCRIPTION] "
+            + "[" +PREFIX_PRIORITY + "PRIORITY] "
             + "[" + PREFIX_GROUP + "GROUP]..."
             + "[" + PREFIX_PERSON_CONNECTION + "INDEX OF PERSON RELATED]...\n"
             + "Example: " + COMMAND_WORD + " "
@@ -131,4 +131,3 @@ public boolean equals(Object other) {
                 && toAdd.equals(((AddMeetingCommand) other).toAdd));
     }
 }
-