question render bug fixes
conflict in dashboard merged