merge app into serve