Add new File to show merge
Merge branch 'bug3106'