Fix merge fault on make.