updating the title
fixing merge