add file to ignore
merge