Merge changes and make site responsive