merge site changes