Resolve conflict to the latest modification of CMGTools/RootTools/python/analyzers/JetAnalyzer.py