Another build error caused by merge error