Break in progress
Resolving conflict