merging payal's repportmanager fix