responsive
fix pull conflit