merged local copy of site