Small fix for merge conflict, small tweak for ghost cursors