ignore sublime files
merge ...