Deal with the conflict

delete the files