add blank choice
fix merge