changes to step1 page
merge conflict
changes to counter offer