fixed merge conflict on dashboard show page