assignments
solved conflicts :D