Fixed merge issue and titles.