Add new file to show merge no ff
Merge branch 'bug3106'