Save merges automatically when resolving conflicts