Merge in old warchest