Fixed A merge error