findOneAndUpdate
merge our changes