Bastion master merge