DemoController changed to test merge