add ingore file when merge