Billing Medical Scheme controller and viewer added
Conflict resolve