Test Cases failing after Smart XPath expired

I have been facing a Merge Conflict issue on Katalon and I am unable to resolve it on Katalon itself, for which I have to go to VisualStudio to resolve that conflict every time I face it. How do I resolve this?