fixed index controller merge conflict