changed echo
conflict resolved