add ingore file
update
resolve conflict