diff --git a/docs/AboutUs.md b/docs/AboutUs.md
index 2ebb69ae1d..e3cc593e72 100644
--- a/docs/AboutUs.md
+++ b/docs/AboutUs.md
@@ -1,13 +1,9 @@
+# About us
 
-<<<<<<< HEAD
-    
-=======
-Display |     Name      |             Github Profile              | Portfolio 
---------|:-------------:|:---------------------------------------:|:---------:
-![](https://via.placeholder.com/100.png?text=Photo) | Low Tjun Lym  |    [Github(https://github.com/LowTL)    | [Portfolio](docs/team/johndoe.md)
-![](https://via.placeholder.com/100.png?text=Photo) |   Fu Xueer    |      [Github](https://github.com/)      | [Portfolio](docs/team/johndoe.md)
-![](https://via.placeholder.com/100.png?text=Photo) | Heng Shu Hong | [Github(https://github.com/HengShuHong) | [Portfolio](docs/team/johndoe.md)
-![](https://via.placeholder.com/100.png?text=Photo) |   Joel Lim    |  [Github(https://github.com/joellimjr)  | [Portfolio](docs/team/johndoe.md)
-![](https://via.placeholder.com/100.png?text=Photo) |  Min Guanlin  |   [Github(https://github.com/Fureimi)   | [Portfolio](docs/team/johndoe.md)
-
->>>>>>> 5b8575bba7f8d21c9316e8660512f4f83b47d547
+Display |   Name   |        Github Profile         | Portfolio 
+--------|:--------:|:-----------------------------:|:---------:
+![](https://via.placeholder.com/100.png?text=Photo) | John Doe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
+![](https://via.placeholder.com/100.png?text=Photo) | Don Joe  | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
+![](https://via.placeholder.com/100.png?text=Photo) | Ron John | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
+![](https://via.placeholder.com/100.png?text=Photo) | Joel Lim |           joellimjr           | [Portfolio](docs/team/johndoe.md)
+![](https://via.placeholder.com/100.png?text=Photo) | Don Roe  | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
diff --git a/src/main/java/Parser/Parser.java b/src/main/java/Parser/Parser.java
new file mode 100644
index 0000000000..6d1a562609
--- /dev/null
+++ b/src/main/java/Parser/Parser.java
@@ -0,0 +1,12 @@
+package Parser;
+
+public class Parser {
+    public String userInput;
+
+    public void parseInput(String userInput){
+
+    }
+
+}
+
+