merge www and master branches