rename files
ignore
merge settings