[addon] Only keep the app dir to merge