fixing conflict in findAndModify

disabling opts.remove when opts.new resolves to true