fixed combo box refreshing
fix merge