resolved conflicts

src/Meta.php

@@ -159,15 +159,4 @@ class Meta extends Model implements FoundationModel, MetaContract
     }
 
     public static function route(){}
-<<<<<<< HEAD
-=======
-
-    public static function create( array $args ){
-        $args['meta'] = serialize([]);
-        $args['uuid'] = '';
-
-        return parent::create($args);
-    }
-
->>>>>>> refs/remotes/origin/master
 }