update
fixed merge conflict on assignment index