FIXED:conficts on merging files