Fixed conflicts, cleaned up site.