add git ignore
merging commit