Resolved merge conflict

README.md

@@ -78,7 +78,11 @@ cas warning: Depending on your IP kernel this server may not be
 cas warning: reachable with UDP unicast (a host's IP in EPICS_CA_ADDR_LIST)
 iocRun: All initialization complete
 epicsEnvSet IOCSH_PS1,"kaffee> "
+```
+
+Switch the difference EPICS base, i.e., 3.15.5 
 
+```
 jhlee@kaffee: e3-require (master)$ . e3-env/setE3Env.bash "3.15.5"
 jhlee@kaffee: e3-require (master)$ iocsh
 
@@ -107,9 +111,6 @@ cas warning: reachable with UDP unicast (a host's IP in EPICS_CA_ADDR_LIST)
 iocRun: All initialization complete
 epicsEnvSet IOCSH_PS1,"kaffee> "
 
-
-
-
 ```
 
 ## TODO

e3-env @ 328f3bea

-Subproject commit eafc0d8b83e82b2be6d9531482e72a174ee947ac
+Subproject commit 328f3bea84406a689658a38ba8a7effb53ff3c6f

require @ 02fb5c42

-Subproject commit ab1def76f99992d9723725c28a8c3c4eacbee459
+Subproject commit 02fb5c42f0600ebb07cb28dc583f0b1375b30c4a