initial version
update git ignore
merge resolve