add gitignore
fix error before merge
resolve conflict