If you do not want to use the result of a merge between versions of a model, you must close the merge editor and not save the merged model.