Resolve conflict in app/models/concerns/routable.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/models/concerns/routable.rb

@@ -102,11 +102,7 @@ module Routable
   # the route. Caching this per request ensures that even if we have multiple instances,
   # we will not have to duplicate work, avoiding N+1 queries in some cases.
   def full_path
-<<<<<<< HEAD
-    return uncached_full_path unless RequestStore.active? && id
-=======
     return uncached_full_path unless RequestStore.active? && persisted?
->>>>>>> upstream/master
 
     RequestStore[full_path_key] ||= uncached_full_path
   end