missed a merge conflict

lib/dao-factory.js

@@ -1153,14 +1153,6 @@ module.exports = (function() {
       }
 
       if (options.validate === true) {
-<<<<<<< HEAD
-        var build    = self.build(attrValueHash)
-          , attrKeys = Object.keys(attrValueHash)
-
-        build.hookValidate({
-          skip: Object.keys(build.dataValues).filter(function(val) { return attrKeys.indexOf(val) !== -1 })
-        }).error(function(err) {
-=======
         var build = self.build(attrValueHash)
 
         // We want to skip validations for all other fields
@@ -1168,7 +1160,6 @@ module.exports = (function() {
         var skippedFields = Utils._.difference(Object.keys(self.attributes), updatedFields)
 
         build.hookValidate({skip: skippedFields}).error(function(err) {
->>>>>>> master
           emitter.emit('error', err)
         }).success(function(attributes) {
           if (!!attributes && !!attributes.dataValues) {