testing a fix for demo view
fix merge conflict