full plot
fix merge