Git merge conflict

Hi, I was trying to use the git integration for Sisense dashboards for version control. It works well for saving previous versions of a project should a customer want to see a previous version. Howev...