merge with the cabin change