git ignore files
merged