I solve most of the conflicts

Quick Reply