finalise
conflict fixed
atom.xml