update
fixed merge conflict in index