changes made for smooth merge