fix app merge