conflict after live changes

database/factories/LocationFactory.php

@@ -16,11 +16,14 @@ $factory->define(Location::class, function (Faker $faker) {
         $lngArray[] = $lng;
         $lng += 0.00715;
     }
+    $time = Carbon::now()->subDays(rand(1, 10))->subHours(rand(8, -8));
 
     return [
         'lat' => array_random($latArray),
         'lng' => array_random($lngArray),
         'created_at' => Carbon::now()->subDays(rand(1, 10))->subHours(rand(8, -8)),
+	    'created_at' => $time,
+	    'updated_at' => $time,
         'user_id' => null,//
     ];
 });