Can you elaborate on the problems you had with conflict resolution? I used Fossil for a couple of personal projects and made a mental note to try it out instead of Git next time I had to host a code repository on a local server.