Fixed conflict until installation bug can be fixed