fixed file with conflicts