added the status flag
removed lkp from function output for flag_conflicts and apply_manual