Merge pull request ethereum#317 from XinFinOrg/resolve-master-conflict

Resolve master conflict

.github/pull_request_template.md

@@ -1,14 +1,10 @@
-## Proposed changes
-
-Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request. If it fixes a bug or resolves a feature request, be sure to link to that issue(or XIP) or explain it in the pull request.
-You description should at least include below key points:
-- Proposed version bump. i.e Major, Minor or patch
-- Proposed release date to testnet and mainnet
+# Proposed changes
+Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
 
 ## Types of changes
 
 What types of changes does your code introduce to XDC network?
-_Put an `x` in the boxes that apply_
+_Put an `✅` in the boxes that apply_
 
 - [ ] Bugfix (non-breaking change which fixes an issue)
 - [ ] New feature (non-breaking change which adds functionality)
@@ -18,25 +14,24 @@ _Put an `x` in the boxes that apply_
 - [ ] CICD Improvement
 
 ## Impacted Components
-
 Which part of the codebase this PR will touch base on,
-_Put an `x` in the boxes that apply_
+
+_Put an `✅` in the boxes that apply_
 
 - [ ] Consensus
-- [ ] Geth
+- [ ] Account
 - [ ] Network
+- [ ] Geth
 - [ ] Smart Contract
-- [ ] EVM
-- [ ] Account
-- [ ] Not sure
-- [ ] N/A
+- [ ] External components
+- [ ] Not sure (Please specify below)
 
 ## Checklist
-_Put an `x` in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code._
+_Put an `✅` in the boxes once you have confirmed below actions (or provide reasons on not doing so) that_
 
-- [ ] This PR have sufficient test coverage (unit/integration test) OR I have provided reason in the PR description for not having test coverage
+- [ ] This PR has sufficient test coverage (unit/integration test) OR I have provided reason in the PR description for not having test coverage
 - [ ] Provide an end-to-end test plan in the PR description on how to manually test it on the devnet/testnet.
 - [ ] Tested the backwards compatibility.
 - [ ] Tested with XDC nodes running this version co-exist with those running the previous version.
 - [ ] Relevant documentation has been updated as part of this PR
-- [ ] N/A
+- [ ] N/A