There have been changes in this class since your changes have been made. Please rebase to latest code before making any updates suggested in this review.