Resolved conflict in variants/heltec_v4/platformio.ini by keeping detailed comments and PIN_BOARD_SDA/SCL definitions from HEAD.
Resolved conflict in variants/heltec_v4/platformio.ini by keeping detailed comments and PIN_BOARD_SDA/SCL definitions from HEAD.