Index: config.xml
===================================================================
diff -u -reabfecc1d8d205f4b8888b99158c54f5ac92ae4e -r9173ebd0962929fe8ab341b7f731d6adb39a0368
--- config.xml	(.../config.xml)	(revision eabfecc1d8d205f4b8888b99158c54f5ac92ae4e)
+++ config.xml	(.../config.xml)	(revision 9173ebd0962929fe8ab341b7f731d6adb39a0368)
@@ -4,8 +4,4 @@
 <description/>
 </information>
 <testsettings/>
-<<<<<<< HEAD
-<passwords/>
-=======
->>>>>>> create_custom_treatment
 </testconfig>