Add all
Resolve conflicts