vaulr merge fix