age.c change

age.c

@@ -6,9 +6,5 @@ void setAge(uint8_t age)
 }
 uint8_t getAge(void)
 {
-<<<<<<< HEAD
 	return g_age+2;
-=======
-	return g_age+1;
->>>>>>> eaed4014ac38e524085ca2b65097b2cd05ca2ebe
 }