fixed index conflict from merge