add field chooser sidebar deal
fix merge