fixed merge error with button to link for lists