Fix build caused by merge