Fix build warning and merge mistake