after merge, links added, doesnt work