add line number report for duplicates and conflicts, and fix the deected flaws in os.*.files