changed file1^^
fixed conficts