gros merge