Fixed silly merge error