# How to resolve merge conflicts in katalon?

**URL:** <https://forum.katalon.com/t/how-to-resolve-merge-conflicts-in-katalon/37050>\
**Category:** Web Testing\
**Tags:** katalon-studio\
**Created:** [December 3, 2019, 7:08am UTC](https://forum.katalon.com/t/how-to-resolve-merge-conflicts-in-katalon/37050 "2019-12-03T07:08:17Z")\
**Posts on this page:** 2\
**Page:** 1

<div class="post-metadata">

**Author:** ![rana.annabathina](https://avatars.discourse-cdn.com/v4/letter/r/9fc29f/32.png) [@rana.annabathina](https://forum.katalon.com/u/rana.annabathina)\
**Post date:** [December 3, 2019, 7:08am UTC](https://forum.katalon.com/t/how-to-resolve-merge-conflicts-in-katalon/37050/1 "2019-12-03T07:08:17Z")

</div>

Hi, is there any way to resolve merge conflicts in katalon studio itself.

---

<div class="post-metadata">

**Author:** ![danzaaa981](https://avatars.discourse-cdn.com/v4/letter/d/5e9695/32.png) [@danzaaa981](https://forum.katalon.com/u/danzaaa981)\
**Post date:** [December 3, 2019, 12:41pm UTC](https://forum.katalon.com/t/how-to-resolve-merge-conflicts-in-katalon/37050/2 "2019-12-03T12:41:33Z")

</div>

Hello @rana.annabathina,

The only way we managed to solve them kind of were to edit the gitignore to something like this:  
/bin/  
/Libs/  
/.settings/  
/.classpath  
/.svn/  
/Reports/  
/settings/internal/com.kms.katalon.composer.testcase.properties

But there still were some problems… So now we are using Sourcetree to manage all Projects in one Repository and chaged the .gitignore to this:  
\*\*/bin/  
\*\*/Libs/  
\*\*/.settings/  
\*\*/.classpath  
\*\*/.svn/  
\*\*/Reports/  
\*\*/settings/internal/com.kms.katalon.composer.testcase.properties

which works perfectly if you dont forget to close the Project in Katalon before commiting.