CAAERS-6593 fix merge Organization