adding gitignore files
fixing conflict