fix conflicts

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,39 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: buger
+
+---
+
+**Branch/Environment**
+- Branch: [e.g. Master/Release/Stable/Feature branch]
+- Environment: [e.g. On-prem/Hybrid/MDCB]
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Reproduction steps**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Actual behavior**
+A clear and concise description of what you expected to happen.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots/Video**
+If applicable, add screenshots or video to help explain your problem.
+
+**Browser/Os (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement, front-end
+assignees: ConsM, jay-deshmukh, lghiur
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,46 @@
+<!-- Provide a general summary of your changes in the Title above -->
+
+## Description
+<!-- Describe your changes in detail -->
+
+## Related Issue
+<!-- This project only accepts pull requests related to open issues -->
+<!-- If suggesting a new feature or change, please discuss it in an issue first -->
+<!-- If fixing a bug, there should be an issue describing it with steps to reproduce -->
+<!-- Please link to the issue here -->
+
+## Motivation and Context
+<!-- Why is this change required? What problem does it solve? -->
+
+## How This Has Been Tested
+<!-- Please describe in detail how you tested your changes -->
+<!-- Include details of your testing environment, and the tests you ran to see how your change affects other areas of
+the code, etc. -->
+
+## Screenshots (if appropriate)
+
+## Types of changes
+<!-- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to change)
+- [ ] Refactoring or add test (improvements in base code or adds test coverage to functionality)
+
+## Checklist
+<!-- Go over all the following points, and put an `x` in all the boxes that apply -->
+<!-- If you're unsure about any of these, don't hesitate to ask; we're here to help! -->
+- [ ] Make sure you are requesting to **pull a topic/feature/bugfix branch** (right side). If pulling from your own
+      fork, don't request your `master`!
+- [ ] Make sure you are making a pull request against the **`master` branch** (left side). Also, you should start
+      *your branch* off *our latest `master`*.
+- [ ] My change requires a change to the documentation.
+  - [ ] If you've changed APIs, describe what needs to be updated in the documentation.
+  - [ ] If new config option added, ensure that it can be set via ENV variable
+- [ ] I have updated the documentation accordingly.
+- [ ] Modules and vendor dependencies have been updated; run `go mod tidy && go mod vendor`
+- [ ] When updating library version must provide reason/explanation for this update.
+- [ ] I have added tests to cover my changes.
+- [ ] All new and existing tests passed.
+- [ ] Check your code additions will not fail linting checks:
+  - [ ] `go fmt -s`
+  - [ ] `go vet`

go.mod

@@ -0,0 +1,27 @@
+module github.com/TykTechnologies/tyk-identity-broker
+
+go 1.13
+
+require (
+	github.com/Jeffail/gabs v1.4.0
+	github.com/go-ldap/ldap v3.0.3+incompatible
+	github.com/go-redis/redis v6.15.6+incompatible
+	github.com/go-redis/redis/v8 v8.0.0-beta.6 // indirect
+	github.com/gorilla/mux v1.7.4
+	github.com/gorilla/sessions v1.2.0
+	github.com/kelseyhightower/envconfig v1.4.0
+	github.com/markbates/goth v1.64.2
+	github.com/mattn/go-colorable v0.1.7 // indirect
+	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
+	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
+	github.com/onsi/ginkgo v1.14.0 // indirect
+	github.com/satori/go.uuid v1.2.0
+	github.com/sirupsen/logrus v1.4.3-0.20191026113918-67a7fdcf741f
+	github.com/x-cray/logrus-prefixed-formatter v0.5.2
+	golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 // indirect
+	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
+	golang.org/x/text v0.3.3
+	gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
+	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
+	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22
+)