box around the graph
Merge fixed conflict
cleaning after merge
cleaning