Resolve issues

[sravanthi.bdl]

Waiting to c how they resole this issue between them