index changed with
conflict resolved