Fix merge error from google