fixed index task
trying to resolve merge conflict
resolving merge conflict