Merge bufix.