Update index
Fix merger conflicts