fix 3.txt  / 1
rebase merge fix
fix 2.txt  / 4
fix 2.txt  / 5
fix 3.txt  / 2
fix 3.txt  / 3