Prepared for conflict (c-2)
Conflict resolved