Merge to live server