add solution items
fix merge
fix