Fix consensus, SSZ, tree hash & run merge EF tests (sigp#2622)

* Update to v1.1.0-beta.4 (squash of sigp#2548)

* SSZ, cached tree hash, EF tests

Author: michaelsproul

consensus/state_processing/src/per_block_processing.rs

@@ -152,6 +152,17 @@ pub fn per_block_processing<T: EthSpec>(
         )?;
     }
 
+<<<<<<< HEAD
+=======
+    if is_execution_enabled(state, block.body()) {
+        let payload = block
+            .body()
+            .execution_payload()
+            .ok_or(BlockProcessingError::IncorrectStateType)?;
+        process_execution_payload(state, payload, spec)?;
+    }
+
+>>>>>>> 5a35ac060 (Fix consensus, SSZ, tree hash & run merge EF tests (#2622))
     Ok(())
 }
 

testing/ef_tests/Makefile

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 TESTS_TAG := v1.1.0-beta.5
+=======
+TESTS_TAG := v1.1.0-beta.4
+>>>>>>> 5a35ac060 (Fix consensus, SSZ, tree hash & run merge EF tests (#2622))
 TESTS = general minimal mainnet
 TARBALLS = $(patsubst %,%-$(TESTS_TAG).tar.gz,$(TESTS))