Another conflict problem because of editing these files from different computers