deleting _site from git
merging