Fixed conflict for createdAt and __v when doing update or findOneAnd…#48

abhijitborade wants to merge 2 commits intodrudge:masterdrudge/mongoose-timestamp:masterfrom

abhijitborade:setOnInsertConflictsabhijitborade/mongoose-timestamp:setOnInsertConflictsCopy head branch name to clipboard