I sometimes fail to resolve conflicts, or rather, my notes partially disappear. That's a bit of a problem.