to be
Resolve conflicts