presentation 24 Dec
merge conflict