Ricard: commit per fer merge