Solve merge conflict

docs/UserGuide.md

@@ -498,8 +498,8 @@ Name[^1] | n/ | Case-sensitive.<br>Only alphanumeric characters allowed. Spaces
 Phone Number[^1] | p/ | Numeric digits only, no special characters, at least 3 digits long. | `123`, `88888888, 12345678`
 Email[^1] | e/ | Valid email of the format `local-part@domain`.<br>1. `local-part` should only contain alphanumeric characters and the special characters `+_.-`<br>2. `local-part` may not start or end with any special characters.<br>3. `local-part` must be followed by exactly one `@` and then a `domain` name.<br>4. `domain` must be made up of at least 2 `domain` labels separated by periods.<br>5. Each `domain` name must be at least 2 alphanumeric characters long.<br>6. Each `domain` name must start and end with alphanumeric characters.<br>7. Each `domain` name can only consist of alphanumeric characters, separated by hyphens, if any. | `[email protected]`, `[email protected]`, `[email protected]`, `[email protected]`
 Module[^1] | m/ | Case-insensitive.<br>Valid module consisting of 2-4 letters, followed by exactly 4 numeric digits, with a suffix that is at most 2 characters long. | `gess1025`, `hsi1000`, `cs2103t`
-Faculty[^1] | f/ | Case-insensitive.<br>Restricted set of values (refer to [valid faculty values](#valid-faculty-values) below). | `soc`, `biz`, `School of Business`
-Venue[^1] | v/ | Any characters allowed, cannot be empty. | `belobog avenue`, `COM4-02-33`, `LT21`, `Kent Ridge Vale, Tulip Street, #12-34`
+Faculty[^1] | f/ | Case-insensitive.<br>Restricted set of values (refer to [valid faculty values](#valid-faculty-values) below).<br>A valid faculty name and its variations (other names) all refer to the same faculty. | `soc`, `biz`, `School of Business`
+Venue[^1] | v/ | Any characters allowed.<br>Cannot be empty. | `belobog avenue`, `COM4-02-33`, `LT21`, `Kent Ridge Vale, Tulip Street, #12-34`
 Tag | t/ | Case-sensitive.<br>Only alphanumeric characters allowed.<br>Person can have any number of tags. | `tutor`, `professor`, `BestProf`, `Number1TA`
 Availability | a/ | Valid format of `day start-time end-time`.<br>Person can have any number of availabilities.<br>1. `day` should be a valid day of week: `Monday`, `mon`, `Tuesday`, `tue`, `tues`, `Wednesday`, `wednes`, `wed`, `Thursday`, `thurs`, `thur`, `thu`, `Friday`, `fri`, `Saturday`, `satur`, `sat`, `Sunday`, `sun`.<br>2. `day` is case-insensitive.<br>3. `start-time` and `end-time` should be in the time format of `HH:mm` where `HH` is in 24 hours (00-23) and `mm` are valid minutes (00-59). | `mon 13:00 14:00`, `monday 13:00 14:00`, `tues 14:00 21:00`
 Meeting Description | d/ | Case-sensitive.<br>Only alphanumeric characters allowed. Spaces are only allowed between alphanumeric characters. | `Meet for finals`, `Midterm revision`
@@ -516,9 +516,8 @@ Business School | Business, Biz School, Biz
 School of Computing | Computing, SoC
 School of Continuing and Lifelong Education | Continuing and Lifelong Education, SCALE
 Faculty of Dentistry | Dentistry
-School of Design and Environment | Design and Environment, SDE
+College of Design and Engineering | Design and Engineering, CDE
 Duke-NUS Medical School | Duke-NUS
-Faculty of Engineering, Engineering | FoE
 Integrative Sciences and Engineering | ISEP
 Faculty of Law | Law
 Yong Loo Lin School of Medicine | Medicine

src/main/java/staffconnect/model/person/Faculty.java

@@ -26,9 +26,8 @@ public enum FacultyName {
         CONTINUING_AND_LIFELONG_EDUCATION("School of Continuing and Lifelong Education",
                 "Continuing and Lifelong Education", "SCALE"),
         DENTISTRY("Faculty of Dentistry", "Dentistry"),
-        DESIGN_AND_ENVIRONMENT("School of Design and Environment", "Design and Environment", "SDE"),
+        DESIGN_AND_ENGINEERING("College of Design and Engineering", "Design and Engineering", "CDE"),
         DUKE_NUS_MEDICAL_SCHOOL("Duke-NUS Medical School", "Duke-NUS"),
-        ENGINEERING("Faculty of Engineering", "Engineering", "FoE"),
         INTEGRATIVE_SCIENCES_AND_ENGINEERING("Integrative Sciences and Engineering", "ISEP"),
         LAW("Faculty of Law", "Law"),
         MEDICINE("Yong Loo Lin School of Medicine", "Medicine", "School of Medicine"),

src/test/java/staffconnect/model/person/predicates/PersonHasFacultyPredicateTest.java

@@ -58,7 +58,7 @@ public void test_personDoesNotHaveFaculty_returnsFalse() {
 
     @Test
     public void toStringMethod() {
-        Faculty faculty = new Faculty("Engineering");
+        Faculty faculty = new Faculty("CDE");
         PersonHasFacultyPredicate predicate = new PersonHasFacultyPredicate(faculty);
 
         String expected = PersonHasFacultyPredicate.class.getCanonicalName() + "{faculty=" + faculty + "}";