Stage before merge
Compromise complete