update assignment
merge week3