From e34199898d5a19e2c043778a5902ddfca232061f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paulo=20Cristov=C3=A3o=20de=20Ara=C3=BAjo=20Silva=20Filho?=
 <pcristof@gmail.com>
Date: Thu, 17 Sep 2026 19:35:18 -0300
Subject: [PATCH] [OPENJPA-2977] Fix merge conflicts