gitignore update
resolve conflict