fixed erros and added gitignore
resolved merge conflict