Added removed variable when solving conflicts