Conflict folder sync fix (thx @ediventurin)