Summary of commit:

Bug fixes:
* enabled.el:
  - Remove merge symbols
* modified.el:
  - Remove merge symbols