oblig3
merge conflict fixed