now up to date on assignments merge