diff --git a/doc/Mega2560/MEGA2560.sch b/doc/Mega2560/MEGA2560.sch
index a4e55c8fe..e6f5a233a 100644
--- a/doc/Mega2560/MEGA2560.sch
+++ b/doc/Mega2560/MEGA2560.sch
@@ -36,11 +36,7 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 1 1
 Title "OpenTX board based on Arduino MEGA2560"
-<<<<<<< HEAD
-Date "19 may 2015"
-=======
-Date "17 may 2015"
->>>>>>> parent of b464283... M2560 schematic update
+Date "20 may 2015"
 Rev "0"
 Comp "Copyright 2015 F. Aguerre"
 Comment1 ""
@@ -346,42 +342,42 @@ F 3 "" H 9100 4600 60  0001 C CNN
 	1    9100 4600
 	1    0    0    -1  
 $EndComp
-Text Label 6450 3850 2    42   ~ 0
+Text Label 6650 3900 2    42   ~ 0
 U_batt
 $Comp
 L R R3
 U 1 1 54994034
-P 6050 4100
-F 0 "R3" V 6130 4100 50  0000 C CNN
-F 1 "2.7K" V 6050 4100 50  0000 C CNN
-F 2 "" H 6050 4100 60  0001 C CNN
-F 3 "" H 6050 4100 60  0001 C CNN
-	1    6050 4100
+P 6250 4150
+F 0 "R3" V 6330 4150 50  0000 C CNN
+F 1 "2.7K" V 6250 4150 50  0000 C CNN
+F 2 "" H 6250 4150 60  0001 C CNN
+F 3 "" H 6250 4150 60  0001 C CNN
+	1    6250 4150
 	-1   0    0    -1  
 $EndComp
 $Comp
 L R R4
 U 1 1 54994033
-P 5800 3850
-F 0 "R4" V 5880 3850 50  0000 C CNN
-F 1 "5.1K" V 5800 3850 50  0000 C CNN
-F 2 "" H 5800 3850 60  0001 C CNN
-F 3 "" H 5800 3850 60  0001 C CNN
-	1    5800 3850
+P 6000 3900
+F 0 "R4" V 6080 3900 50  0000 C CNN
+F 1 "5.1K" V 6000 3900 50  0000 C CNN
+F 2 "" H 6000 3900 60  0001 C CNN
+F 3 "" H 6000 3900 60  0001 C CNN
+	1    6000 3900
 	0    1    -1   0   
 $EndComp
 $Comp
 L GND #PWR?
 U 1 1 54994032
-P 6050 4450
-F 0 "#PWR?" H 6050 4450 30  0001 C CNN
-F 1 "GND" H 6050 4380 30  0001 C CNN
-F 2 "" H 6050 4450 60  0001 C CNN
-F 3 "" H 6050 4450 60  0001 C CNN
-	1    6050 4450
+P 6250 4500
+F 0 "#PWR?" H 6250 4500 30  0001 C CNN
+F 1 "GND" H 6250 4430 30  0001 C CNN
+F 2 "" H 6250 4500 60  0001 C CNN
+F 3 "" H 6250 4500 60  0001 C CNN
+	1    6250 4500
 	1    0    0    -1  
 $EndComp
-Text Notes 5400 3500 0    60   ~ 0
+Text Notes 5600 3550 0    60   ~ 0
 Battery voltage reading
 Text Notes 7250 1950 0    60   ~ 0
 Rotary encoders (x2)
@@ -40958,12 +40954,12 @@ $EndComp
 $Comp
 L +BATT U?
 U 1 1 549E8260
-P 5450 3750
-F 0 "U?" H 5450 3700 60  0001 C CNN
-F 1 "+BATT" H 5450 3850 50  0000 C BNN
-F 2 "" H 5450 3750 60  0001 C CNN
-F 3 "" H 5450 3750 60  0001 C CNN
-	1    5450 3750
+P 5650 3800
+F 0 "U?" H 5650 3750 60  0001 C CNN
+F 1 "+BATT" H 5650 3900 50  0000 C BNN
+F 2 "" H 5650 3800 60  0001 C CNN
+F 3 "" H 5650 3800 60  0001 C CNN
+	1    5650 3800
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -41136,11 +41132,7 @@ CA 3B B1 B4 D6 FB 76 3A 4D 11 32 4D 1E A1 3D 78 1C 8B 1E 14 74 10 57 46 8C 97 FB
 33 B3 93 2C A5 90 EC 7D 2B A5 BC 7A F5 EA E1 E1 5E 44 C8 BD 2E 90 84 08 60 87 C2 BB D7 FD 40 85 
 4A 52 6F 3D D0 6D 9E 6E 41 36 CA 77 04 97 99 83 92 6E D1 7C 20 6D 2C 33 D2 7F 5B 16 F2 83 51 39 
 A0 3F CF F3 A7 9F 7E FA CB 5F FE F5 EB D7 AF 45 64 59 96 6D DB F6 23 3E B3 52 CA B3 1B C5 00 F7 
-<<<<<<< HEAD
-08 C0 CC FE 1F 15 4F 30 6D 3D C2 80 DE 00 00 00 00 49 45 4E 44 AE 42 60 82 07 $EndBitmap
-=======
 08 C0 CC FE 1F 15 4F 30 6D 3D C2 80 DE 00 00 00 00 49 45 4E 44 AE 42 60 82 00 $EndBitmap
->>>>>>> parent of b464283... M2560 schematic update
 EndData
 $EndBitmap
 $Comp
@@ -41208,7 +41200,7 @@ Wire Wire Line
 Wire Wire Line
 	2400 1700 2500 1700
 Wire Wire Line
-	6050 4350 6050 4450
+	6250 4400 6250 4500
 Wire Wire Line
 	9600 2250 9450 2250
 Wire Wire Line
@@ -41612,7 +41604,7 @@ Wire Wire Line
 Wire Wire Line
 	10750 3800 10750 4200
 Wire Wire Line
-	6450 3850 6050 3850
+	6650 3900 6250 3900
 Wire Wire Line
 	1900 1450 1900 1700
 Wire Wire Line
@@ -41650,9 +41642,9 @@ Wire Wire Line
 Wire Wire Line
 	4400 1350 4850 1350
 Wire Wire Line
-	5450 3750 5450 3850
+	5650 3800 5650 3900
 Wire Wire Line
-	5450 3850 5550 3850
+	5650 3900 5750 3900
 Wire Wire Line
 	7500 4600 8600 4600
 Connection ~ 8300 4600
@@ -41747,7 +41739,7 @@ F 3 "" H 1750 7050 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 Text Notes 4850 6550 0    42   ~ 0
-LCD supported : ST7565P, ST7565R, ERC12864FSF, ST7920\n\nLCD pinout labels (may differ, depending of brand) :\nA0 = R/S (register select) or D/I (data/instruction select)\nRST = RES (reset)\nCS = chip select (not used on ST7920)\nWR = write or read(1)/write(0) on ST7920\nRD = read or serial clock line (in 8bit parallel mode) on ST7920
+LCD supported : ST7565P, ST7565R, ERC12864FSF, ST7920\nProtocol = 6800, 8 bits parallel mode\n\nLCD pinout labels (may differ, depending of brand) :\nRD = Read or Enable on ST7920\nWR = WRite or Write(0)/Read(1) on ST7920\nA0 = R/S (register select) or D/I (data/instruction select)\nRST = RES (reset)\nCS = Chip Select (not used on ST7920)
 Text Label 6550 7550 2    42   ~ 0
 OpenTX input
 Text GLabel 5250 7550 2    42   Input ~ 0
@@ -41756,4 +41748,6 @@ Wire Wire Line
 	6050 7550 6550 7550
 Wire Wire Line
 	5100 7550 5250 7550
+Text Notes 2300 2950 0    60   ~ 0
+NOTA : all features are optional !\nM2560 can properly work without switch deboucing,\nrotary encoder or PPM / power management.\nMinimum requirement is just LCD and navigation keys.\nSome switches could be usefull, especially for flight\nconditions, but not fundamental.
 $EndSCHEMATC
diff --git a/doc/Mega2560/MEGA2560_SCH.pdf b/doc/Mega2560/MEGA2560_SCH.pdf
index 8aaace455..87281add8 100644
Binary files a/doc/Mega2560/MEGA2560_SCH.pdf and b/doc/Mega2560/MEGA2560_SCH.pdf differ