trying emacs merge again with different xserver