Resolved index conflict