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