Some conflicts have not been resolved.  Would you like to save the file anyway?

This warning has the following cause and solution:

• Not all conflicts in the merged file have been resolved.

  Click Yes to save the unresolved file, or No to discard your changes and exit.