Fix build and merge error