All conflicts have been resolved, would you like to save the file?

This message has the following cause and solution: