adding ignore file
adding content
merge ignores