Changed file old
Change file part2
Changed file README
The conflict was solwed