Fixed merge conflict in Bush Viper prefab