what I made in university
merge conflict solved