identing fix due to text editors conflits