fix merge stuff again