p7 solved
better solution
p08 solved
Merge remote branch 'origin/master'