update resolve conflicts between evil-mode and ecb