[Chris, Jason] Fix caret position on merge