solve conflict in sfa/plc/aggregate.py