Fix build from mismerges