Fix merge conflict
Fix merge conflict

sMteX/WoWAnalyzer,enragednuke/WoWAnalyzer,ronaldpereira/WoWAnalyzer,sMteX/WoWAnalyzer,FaideWW/WoWAnalyzer,Juko8/WoWAnalyzer,yajinni/WoWAnalyzer,FaideWW/WoWAnalyzer,FaideWW/WoWAnalyzer,fyruna/WoWAnalyzer,WoWAnalyzer/WoWAnalyzer,WoWAnalyzer/WoWAnalyzer,anom0ly/WoWAnalyzer,ronaldpereira/WoWAnalyzer,ronaldpereira/WoWAnalyzer,hasseboulen/WoWAnalyzer,fyruna/WoWAnalyzer,anom0ly/WoWAnalyzer,Juko8/WoWAnalyzer,enragednuke/WoWAnalyzer,Juko8/WoWAnalyzer,yajinni/WoWAnalyzer,sMteX/WoWAnalyzer,WoWAnalyzer/WoWAnalyzer,hasseboulen/WoWAnalyzer,anom0ly/WoWAnalyzer,anom0ly/WoWAnalyzer,fyruna/WoWAnalyzer,hasseboulen/WoWAnalyzer,yajinni/WoWAnalyzer,yajinni/WoWAnalyzer,enragednuke/WoWAnalyzer