merge app to api
mege