git ignore
added file
merge