recovery deleted file -- git checkout - filename
cantnot merge
add gitignore