fix merge confict

fix merge confict with Node.java ande AdminManager.java