Fix merger issue with dashboard