resolving merge conflict
resolve merge conflict; edit gitignore