Remove duplicate variable from bad merge