Fix use of variable removed in merge