Don't map C-x C-@ to ace-jump-mode

pop-global-mark might be useful.
Add a custom "goto last change" using undo-tree