Suppressed conflict

We supressed conflict in the class "Algotirthms"