solved a conflictive files isue