chang currrentIndex
manage conflict
Merge remote-tracking branch 'upstream/master'
manage conflict