specify more specific error messages instead of just `'conflict'`, since conflicts are expected in different parts (in `versions`, in section markers, ...)