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