DemoController changed to test merge2