fixed conflict

Gemfile.lock

@@ -329,13 +329,10 @@ GEM
       money (~> 6.13.2)
       railties (>= 3.0)
     msgpack (1.7.2)
-<<<<<<< HEAD
     net-ftp (0.3.7)
       net-protocol
       time
-=======
     mutex_m (0.2.0)
->>>>>>> 5f9bc1f5e (fixed method for check force delete)
     net-protocol (0.1.3)
       timeout
     net-smtp (0.3.3)
@@ -385,13 +382,8 @@ GEM
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-<<<<<<< HEAD
-    public_suffix (5.0.0)
-    puma (5.6.9)
-=======
     public_suffix (6.0.1)
     puma (5.6.8)
->>>>>>> 5f9bc1f5e (fixed method for check force delete)
       nio4r (~> 2.0)
     racc (1.8.1)
     rack (2.2.9)
@@ -628,8 +620,4 @@ DEPENDENCIES
   wkhtmltopdf-binary (~> 0.12.6.1)
 
 BUNDLED WITH
-<<<<<<< HEAD
-   2.5.15
-=======
    2.5.19
->>>>>>> 5f9bc1f5e (fixed method for check force delete)