Closed liuanna closed 8 years ago
Resolved your merge conflict and created a new pull request. Please take a look.