Can't resolve conflicts, they endlessly reappaer

[asdasdasd]

Super cool, thanks plastic for having me spend countless hours trying to fix your bs while I could be working on my project! Really the bees knees of version control software!

[calbzam]

Hi,

if you are paying user, please reach us at support@codicesoftware.com and we can arrange a meeting with you to debug your issues.

Otherwise, please include the details of the error so we can debug and fully understand the merge problems you are facing.

Sorry for the inconveniences,

Carlos.