Fix unexpected data
Fix merge error