fixed init file
fixed add git ignore file
fixed add git ignore file
merge conflict