[test]:modified .gitignore
[test]:resolve conflict