update fig
conflict resolved