stage 3 basics
merge conflict solved