adding log parser, merging