Update build
Resolve conflicts