aded string5.1-5.4 in file
Changed string5 in file2 "collision"
merge fix conflict