resolved min conflicts
update