improvement responsive
fix merge