text content changed on steps 1,2,3
conflict resolved