editing links on main page
merging