Add --replacefiles option to resolve file conflicts (bnc#673720)
changes