Update src/node/Node.java

fixed conflict