merge www to master