updated gitignore file
fixing merge errors