Great work Mathieu! I've been using this for a week and my team and I are planning to use this for a serious workflow that involves designer and developer collaboration. Looking forward to it.
I'm pretty sure the conflict issue will be addressed in the upcoming updates.
Also if you can please try to add a visual representation of the git branches, (like source tree) it would also help us users understand visually how the branches merge, where the active branch is etc.