MERGE FOIREUX RESOLUT!