fix merge mistakes