fix git ignore
full merge