private void testMergeAndUnmergeDeep(ServerConnector serverConnector)
			throws ServerError {

		log("testMergeAndUnmergeDeep");

		List<Trip> tripsfirst = serverConnector.readByType("trip", null);
		List<Trip> trips = serverConnector.readByType("trip", null);
		log("number of trips at first " + tripsfirst.size() + " at second "
				+ trips.size());

		int number_of_trips_at_beginning = trips.size();

		ArrayList<Trip> m1 = new ArrayList<>();
		m1.add(trips.get(0));
		m1.add(trips.get(1));

		ArrayList<Trip> m2 = new ArrayList<>();
		m2.add(trips.get(2));
		m2.add(trips.get(3));

		Trip tm1 = serverConnector.merge(m1);

		Trip tm2 = serverConnector.merge(m2);

		ArrayList<Trip> m3 = new ArrayList<>();
		m3.add(tm1);
		m3.add(tm2);

		serverConnector.merge(m3);

		List<Trip> trips_after_merge = serverConnector.readByType("trip", null);

		if (trips_after_merge.size() != trips.size() - 3)
			throw new RuntimeException("missing trips before" + trips.size()
					+ " after " + trips_after_merge.size());

		log("merge completed. now unmerging: number of trips " + trips_after_merge.size());

		List<Trip> unmerged = serverConnector.unmerge(trips_after_merge.get(0)
				.getServerId());

		if (unmerged.size() != 2)
			throw new RuntimeException("upon unmerge getting "
					+ unmerged.size() + " trips");

		log ("reverted merge of merges");
		log ("mergedTripCount of first unmerged " + unmerged.get(0).getMergedTripCount());
		log ("mergedTripCount of second unmerged " + unmerged.get(1).getMergedTripCount());

		// this is the call that fails with 504
		serverConnector.unmerge(unmerged.get(0).getServerId());

		List<Trip> unmerge_level_2 = serverConnector.unmerge(unmerged.get(1)
				.getServerId());

		log ("reverted both unmerged trips");

		log("all first level merges have been reverted");

		trips = serverConnector.readByType("trip", null);
		log("number of trips " + trips.size() + " unmgerge level2 "
				+ unmerge_level_2.size());

		log("unmgerge level2 mergeTripCount "
				+ unmerge_level_2.get(0).getMergedTripCount());

		serverConnector.unmerge(unmerge_level_2.get(0).getServerId());

		trips = serverConnector.readByType("trip", null);
		log("all done. number of trips " + trips.size());

		if (trips.size() != number_of_trips_at_beginning)
			throw new RuntimeException("unequal number of trips "
					+ number_of_trips_at_beginning + " vs " + trips.size());

		log("completed testMergeAndUnmergeDeep");
	}