Fix merge for gitian build