fixed a problem with responsive
pull from remote for merge