Is there any better way to resolve Internal Test Data Conflicts in using source control

Hi Team,

We are facing issues with column index while merging the Katalon Internal Test Data with GIT Integration.

Issue1: Changing column index.
Issue2: Row data position need to be changed.

Currently we are spending more time to update it Manual.

Any document reference would be really appreciated.


@Katalon Dev Team

Do you guys have any better documentation? or any fix in progress?