merge with cabin changes