or, better, that would be good to have a message explaining there is a  "conflict" between two files, pointing out which ones.