changes made for smooth merge
fixed merge issues