fix another merge conflict

Author: vkarpov15

lib/mongoose.js

@@ -1172,7 +1172,7 @@ Mongoose.prototype.CastError = require('./error/cast');
  * @api public
  */
 
-Mongoose.prototype.SchemaTypeOptions = require('./options/SchemaTypeOptions');
+Mongoose.prototype.SchemaTypeOptions = require('./options/schemaTypeOptions');
 
 /**
  * The [mquery](https://github.com/aheckmann/mquery) query builder Mongoose uses.