atom.xml
atom merge resolved