RAZ-2831: Updated merge files