merge
remove
added ignore
merge
resolve merge
merge
release version