discussion 2 update
merge