resolve all conflict