fixed merge problems causing duplication of links on listing pages
merge clashes fixed