modal finished
fix merge