add log parser
merge branches