reverting line that was discarded on merge