guide update CAP 5
new update 4 merge problems
test merge override
test override
override - update guide in master like in branch