working proto
merge