Basis are now good. Ready to code.
Merge remote-tracking branch 'origin/master'