Check Update Matrix
Fix merge issue
Problem solved