added file gitignore
fixed merge error