fixing conflict in multi payroll