Removed merge conflict markers.
Cleaning site dir.