diff --git a/README.md b/README.md
index 62479db5ae4f..290150d84f68 100644
--- a/README.md
+++ b/README.md
@@ -1,40 +1,38 @@
-<<<<<<< HEAD
-
-OpenMRS is an patient-based medical record system focusing on giving providers a free customizable EMR.
-
-Read more at http://openmrs.org/about
-
-Find documentation on our wiki: http://wiki.openmrs.org
-
+OpenMRS is an patient-based medical record system focusing on giving providers a free customizable EMR.
+
+Read more at http://openmrs.org/about
+
+Find documentation on our wiki: http://wiki.openmrs.org
+
 The project tree is set up as follows:
-
-<table>
- <tr>
-  <td>.settings</td>
-  <td>Eclipse specific settings. Useful for character encoding and formatting (for devs using eclipse anyway)</td>
- </tr>
- <tr>
-  <td>api/</td>
-  <td>java and resource files for building the java api jar file.</td>
- </tr>
- <tr>
-  <td>release-test</td>
-  <td>Cucumber/selenium integration tests. Run daily against a running webapp. See https://wiki.openmrs.org/display/docs/Testing+Releases</td>
- </tr>
- <tr>
-  <td>test</td>
-  <td>TBD</td>
- </tr>
- <tr>
-  <td>tools</td>
-  <td>Meta code used during compiling and testing. Does not go into any released binary (like doclets)</td>
- </tr>
- <tr>
-  <td>web/</td>
-  <td>java and resource files that are used in the webapp/war file.</td>
- </tr>
- <tr>
-  <td>webapp/</td>
+
+<table>
+ <tr>
+  <td>.settings</td>
+  <td>Eclipse specific settings. Useful for character encoding and formatting (for devs using eclipse anyway)</td>
+ </tr>
+ <tr>
+  <td>api/</td>
+  <td>java and resource files for building the java api jar file.</td>
+ </tr>
+ <tr>
+  <td>release-test</td>
+  <td>Cucumber/selenium integration tests. Run daily against a running webapp. See https://wiki.openmrs.org/display/docs/Testing+Releases</td>
+ </tr>
+ <tr>
+  <td>test</td>
+  <td>TBD</td>
+ </tr>
+ <tr>
+  <td>tools</td>
+  <td>Meta code used during compiling and testing. Does not go into any released binary (like doclets)</td>
+ </tr>
+ <tr>
+  <td>web/</td>
+  <td>java and resource files that are used in the webapp/war file.</td>
+ </tr>
+ <tr>
+  <td>webapp/</td>
   <td>jsp files used in building the war file.</td>
  </tr>
  <tr> 
@@ -43,7 +41,7 @@ The project tree is set up as follows:
  </tr>
  <tr>
   <td>build.xml</td>
-  <td>(deprecated)ANT build file containing convenience methods into the maven build</td>
+  <td>(deprecated) ANT build file containing convenience methods into the maven build</td>
  </tr>
  <tr>
   <td>license.txt</td>
@@ -55,7 +53,7 @@ The project tree is set up as follows:
  </tr>
  <tr>
   <td>openmrs-checkstyle.properties</td>
-  <td>properties for the checkstyle library</td>
+  <td>properties for the checkstyle library</td>
  </tr>
  <tr>
   <td>pom.xml</td>