Merged Conflicts for conf/routes
Resolved conflicts for Applicaiton.java
Resolved all conflicts