merge from demo to app