Your post reminded me of the following post
5 years ago, *.ts file (Test Suite definition file) contained <lastRun> element which caused merge conficts very often. It annoyed users a lot.
Later, (a year ?), Katalon removed the <lastRun> element out of the *.ts file:
The problem was fixed.
2 Likes