loader added'
conflict resolved';