fixed index problem
resolving minor conflict