grunt-browser-stync support
conflict fixed