Adding indexes
Fix conflicts