rebuilding from merge fiasco