ignore some file
merge