Ender3 bed added to slicer

PrusaSlicer/printer/Creality Ender-3 Stock + BLTouch RECALL.ini

@@ -1,9 +1,6 @@
 <<<<<<< HEAD
 # generated by PrusaSlicer 2.1.0+win64 on 2019-10-14 at 02:07:42 UTC
 bed_custom_model = ender3_bed.stl
-bed_custom_texture = 
-=======
-# generated by PrusaSlicer 2.0.0+win64 on 2019-07-31 at 02:41:30
 >>>>>>> cc3c64d9dcdad46da2603edf3c376b56df5590d1
 bed_shape = 0x0,235x0,235x235,0x235
 before_layer_gcode = ;BEFORE_LAYER_CHANGE\n;Layer [layer_num]\n;[layer_z]mm\n;Printing layer [layer_num] at [layer_z]mm\n\n

PrusaSlicer/printer/Creality Ender-3 Stock + BLTouch.ini

@@ -1,10 +1,6 @@
-<<<<<<< HEAD
 # generated by PrusaSlicer 2.1.0+win64 on 2019-10-14 at 02:07:29 UTC
 bed_custom_model = ender3_bed.stl
 bed_custom_texture = 
-=======
-# generated by PrusaSlicer 2.0.0+win64 on 2019-07-31 at 02:41:37
->>>>>>> cc3c64d9dcdad46da2603edf3c376b56df5590d1
 bed_shape = 0x0,235x0,235x235,0x235
 before_layer_gcode = ;BEFORE_LAYER_CHANGE\n;Layer [layer_num]\n;[layer_z]mm\n;Printing layer [layer_num] at [layer_z]mm\n\n
 between_objects_gcode =