adding assignments
trying again
merging