merge with remote repository
changed the .gitignore file