So, every now and then on a PR I need to rebase and fix things so I can retest etc. – I always forget this so blogging…