add cloned file
branch test
recover cuz a conflict happened in merge process
delete two lines
modefied on dev
2nd on dev
2nd on master
is confict fixed?
Merge branch 'dev'
confict fixed after git pull
delete two empty lines