add conflicts to control file