Changed applyDiff.isConflict getter to applyDiff.isConflict() getter method (to make it work in IE8)
Merge pull request #26 from ZauberNerd/isconflict-fn

Changed applyDiff.isConflict to applyDiff.isConflict() to make it work in old browsers