Compile assets
Resolve conflict