resolved bug| B03- Hemanth,Sneha
resolved merge conflict |hemanth,Sneha