fix index conflict