Update ReadWriteEDI.java

add comment about conflict in git