Add more apps
Resolve conflict