some emacs housekeeping
fixed conflict