solve merge conflicts

test.py

@@ -9,11 +9,8 @@ It first creates model and dataset given the option. It will hard-code some para
 Example (You need to train models first):
 
      Test a Change Detection based on pix2pix model:
-<<<<<<< HEAD
+
                python test.py --dataroot /patches --dataset /test_set/patch_coords.json --name S2_NET_001 --results_dir /results
-=======
-               python test.py --dataroot /patches --dataset /test_set/patch_coords.json --name CD_NET --results_dir /results
->>>>>>> 3c6a3edf9fade715d06aa570c759fb31475ed83a
 
 
 See options/base_options.py and options/test_options.py for more test options.