add more figure text
fix merge conflicts