ignore settings
merge