Latest Atom configuration
Fix for not being able to merge EXCEPT by fast-forward