Fix Merge Protocol compatibility Changes Error