fix merge differences from this week