DemoController changed to test merge1