merge ignore file
modify test