Fix conflict manager spec