remove some conflict errors and fix warnings

[javeme]

Change-Id: I87ced31d03f4e49d9642d2f8b757ffe1e4197cee

[codecov]

Codecov Report

Merging #1003 into master will decrease coverage by 0.00%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##             master    #1003      +/-   ##
============================================
- Coverage     69.35%   69.34%   -0.01%     
+ Complexity     5275     5274       -1     
============================================
  Files           325      325              
  Lines         25870    25870              
  Branches       3647     3647              
============================================
- Hits          17941    17940       -1     
+ Misses         6207     6206       -1     
- Partials       1722     1724       +2     

Impacted Files	Coverage Δ	Complexity Δ
...ugegraph/backend/cache/CachedGraphTransaction.java	88.37% <ø> (ø)	36.00 <0.00> (ø)
...ugegraph/backend/store/memory/InMemoryDBTable.java	67.14% <ø> (ø)	42.00 <0.00> (ø)
.../hugegraph/job/system/DeleteExpiredElementJob.java	70.58% <ø> (ø)	4.00 <0.00> (ø)
...du/hugegraph/job/system/DeleteExpiredIndexJob.java	84.84% <ø> (ø)	9.00 <0.00> (ø)
...u/hugegraph/backend/store/hbase/HbaseSessions.java	59.93% <ø> (ø)	21.00 <0.00> (ø)
...u/hugegraph/backend/serializer/TextSerializer.java	86.68% <100.00%> (ø)	94.00 <0.00> (ø)
...m/baidu/hugegraph/job/system/DeleteExpiredJob.java	53.12% <100.00%> (ø)	4.00 <0.00> (ø)
...a/com/baidu/hugegraph/backend/query/Condition.java	79.67% <0.00%> (-0.41%)	31.00% <0.00%> (ø%)
...du/hugegraph/backend/tx/GraphIndexTransaction.java	79.71% <0.00%> (-0.13%)	189.00% <0.00%> (-1.00%)
...om/baidu/hugegraph/task/StandardTaskScheduler.java	86.52% <0.00%> (+0.35%)	68.00% <0.00%> (ø%)

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update eb8fa1c...aad2f05. Read the comment docs.