fixed merge error. added more files to gitignore