I couldn't find any resource names (pipeline name or datasets name) in the conflict. We did the following steps to resolve this issue asap as a work around.
- We deleted ARMTemplateForFactory.json and ARMTemplateParametersForFactory.json files.
- And created a new branch, completed pull request and published. It recreated both ARM files, and is working fine now.
We don't think it is the right solution, would like to know the correct solution for future reference. Thank you.