Github user spmallette commented on the issue:
https://github.com/apache/tinkerpop/pull/915
@ashwinisingh01 strange that you have so many conflicts on classes that you
didn't touch. it looks like your PR is a little messed up because it contains
my commits in addition to yours. please have a look at why that is the case.---
