Merge controller basic and forms apps