Fix merge error, update comments.