Remove merge conflict in keybindings.el
Add my-config.el