removed duplicate files to resolve conflicts