manual merge fixes