updates responsiveness
fixed the conflicts
fixing conflicts