PM: Remove conflict files