fix silly merge