figs and result table
resolve conflict