Retry add those conflict files