minor fixes to graph

script/Graph_drone.graph

@@ -1,9 +1,5 @@
 0	-1	-1	-1
 1	0	1000.0	0.0
 2	0	1000.0	1.57
-<<<<<<< HEAD
 3	0	1000.0	3.14
 4	0	1000.0	4.71
-=======
-3	0	1000.0	3.14
->>>>>>> 8e5acd264dbf2b5fc3cafd00fb9a08a82a8095f7

script/graphform.bzz

@@ -88,7 +88,7 @@ step_cunt=0
 v_tag = stigmergy.create(1)
 
 # Lennard-Jones parameters
-EPSILON    = 3.5 #3.5
+EPSILON    = 13.5 #3.5
 
 # Lennard-Jones interaction magnitude
 
@@ -705,7 +705,7 @@ if(m_nLabel>1){
 	log(";",m_nLabel,";",mypred1.range-m_vecNodes_fixed[m_nLabel].d1)
 }
 #move
-uav_moveto(m_navigation.x/100.0,m_navigation.y/100.0)
+uav_moveto(m_navigation.x,m_navigation.y)
 }
 
 function action(){

script/include/uavstates.bzz

@@ -50,11 +50,7 @@ function land() {
 		uav_land()
 	}
 	else {
-<<<<<<< HEAD
 		barrier_set(ROBOTS,turnedoff,land)
-=======
-		barrier_set(ROBOTS,idle,land)
->>>>>>> 8e5acd264dbf2b5fc3cafd00fb9a08a82a8095f7
 		barrier_ready()
 		timeW=0
 		#barrier = nil
@@ -62,7 +58,6 @@ function land() {
 	}
 }
 
-<<<<<<< HEAD
 function follow() {
 	if(size(targets)>0) {
 		UAVSTATE = "FOLLOW"
@@ -79,8 +74,6 @@ function follow() {
 	}
 }
 
-=======
->>>>>>> 8e5acd264dbf2b5fc3cafd00fb9a08a82a8095f7
 function uav_rccmd() {
     if(flight.rc_cmd==22) {
 		log("cmd 22")
@@ -97,17 +90,11 @@ function uav_rccmd() {
 		neighbors.broadcast("cmd", 21)
 	} else if(flight.rc_cmd==16) {
 		flight.rc_cmd=0
-<<<<<<< HEAD
 		UAVSTATE = "FOLLOW"
 		log(rc_goto.latitude, " ", rc_goto.longitude)
 		add_targetrb(0,rc_goto.latitude,rc_goto.longitude)
 		statef = follow
 		#uav_goto()
-=======
-		statef = idle
-		#uav_goto()
-		add_user_rb(10,rc_goto.latitude,rc_goto.longitude)
->>>>>>> 8e5acd264dbf2b5fc3cafd00fb9a08a82a8095f7
 	} else if(flight.rc_cmd==400) {
 		flight.rc_cmd=0
 		uav_arm()