Mark branch 'rochade' as merged