initial
merge ignore files