fix(Change Detection): fix merge error