remove unnecessary override and accidentally merge issue