Log mutations only when something other than cursor changes
Fix merge conflicts