Committing files in the case of conflict.