fix merge lines