i3: emacs -> emacsclient
i3: fixed conflict