Solve merge conflict.
Solve merge conflict.

cblichmann/yara,wxsBSD/yara,VirusTotal/yara,pombredanne/yara,VirusTotal/yara,plusvic/yara,cblichmann/yara,wxsBSD/yara,hillu/yara,pombredanne/yara,pombredanne/yara,plusvic/yara,hillu/yara,VirusTotal/yara,cblichmann/yara,plusvic/yara,cblichmann/yara,VirusTotal/yara,hillu/yara,cblichmann/yara,plusvic/yara,VirusTotal/yara,plusvic/yara,wxsBSD/yara,pombredanne/yara,pombredanne/yara,hillu/yara,wxsBSD/yara,hillu/yara,wxsBSD/yara