.gitignore without merge data