         return request
     }
     
-<<<<<<< HEAD
-    class func request(fetchedObjects: FetchedObjects, inContext context: NSManagedObjectContext?, filteredBy filter: NSPredicate?, var sortedBy sortDescriptors: [NSSortDescriptor]?) -> (NSFetchRequest) {
-        var fetchRequest: NSFetchRequest = self.fetchRequest(inContext: context)
-=======
+
     class func request(fetchedObjects: FetchedObjects, inContext context: NSManagedObjectContext?, filteredBy filter: NSPredicate?, var sortedBy sortDescriptors: [NSSortDescriptor]?) -> (fetchRequest: NSFetchRequest) {
         var fetchRequest: NSFetchRequest = self.request(inContext: context)
->>>>>>> a476f81c80da45ced3d6c960cdabea65d53f3a8e
         
         // Order
         var revertOrder: Bool = false

            databaseName = srDefaultDatabaseName
        }
        if !databaseName.hasSuffix("sqlite") {
            databaseName = databaseName.stringByAppendingPathExtension("sqlite")!
        }
        return databaseName
    }

    ////// REQUESTS //////
    
    // Create and returns the fetch request
    class func request(var inContext context: NSManagedObjectContext?) -> (fetchRequest: NSFetchRequest) {
        if context == nil {
            context = NSManagedObjectContext.defaultContext()
        }
