added z
modified emacs to comply with conflict