Fixing an index bug
Resolved conflict