add a comment in branch master

I want to make a test about fix conflict,so I edited the same line in two
different branchs.