Merge and buf fix