Removing conflicts strings in differents files