resolve conflict graph.php