màj arete->isEdge
resolve conflict
resolve conflict
resolve conflict git add GraphCRUD.javagit add GraphCRUD.javagit add GraphCRUD.java
delete conflict file