show echo
resolved conflict