Fixed the indexes on site_data
Fixed a merge bug