Katalon - Git conflict with "profile/default.glbl"

Hello everybody.

I got some problems using Git integration and working with 3 different computers.

I have some changes and user global variables in my project, so when I finish, I commit and push my changes, however 2 different scenarios happends:

1.- one computer clone the proyects without problems, but if we open Profile to see global variables, this it’s empty,

2.- another computer already clone the project before I add my changes, If we Pull changes that are in te repository. Got a conflict and it doesn’t show me an option to solve the conflict.

Here is a screenshot so you can see the error:


I wonder if I shouldn’t commit Global variables or I need to commit something else that affects these global variables?

Hope you can help me to understand this problem.

Thanks a lot