add two line code in master branch,means bug fix
make a conflict in master
Merge branch 'master' into r2_laptop
done