generate summary
rslv conflicts
fix bug of merge strategy