Git Merge conflict com.kms.katalon.composer.testcase.properties

I have ever posted some in this Forum asking Katalon Team to let me edit .gitigore and README.md files.

Katalon team listed this requirement into their back log.

but there seems to be no progress yet.