Merge ode app and ode-gui app