Merging live site with the repository