.gitignore without merge data
Merge branch 'test'