Add a new field for assignment id
Add stuff that got overwritten back
resolve merge conflict.