diff --git a/cores/arduino/Stream.cpp b/cores/arduino/Stream.cpp
index b31942f29..3e5235744 100644
--- a/cores/arduino/Stream.cpp
+++ b/cores/arduino/Stream.cpp
@@ -159,7 +159,7 @@ float Stream::parseFloat(char skipChar){
   bool isNegative = false;
   bool isFraction = false;
   long value = 0;
-  char c;
+  int c;
   float fraction = 1.0;
 
   c = peekNextDigit();
diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp
index 31e0a1d8a..7abf8d54a 100644
--- a/libraries/Wire/Wire.cpp
+++ b/libraries/Wire/Wire.cpp
@@ -49,12 +49,19 @@ void TwoWire::begin(uint8_t address) {
   sercom->enableWIRE();
 }
 
+<<<<<<< HEAD
+void TwoWire::setClock(uint32_t baudrate) {
+  sercom->disableWIRE();
+  sercom->initMasterWIRE(baudrate);
+  sercom->enableWIRE();
+=======
 void TwoWire::end() {
   sercom->disableWIRE();
 }
 
 void TwoWire::setClock(uint32_t frequency) {
 	// dummy funtion
+>>>>>>> arduino/master
 }
 
 uint8_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool stopBit)
diff --git a/libraries/Wire/Wire.h b/libraries/Wire/Wire.h
index 4b4ce1e44..b06b24211 100644
--- a/libraries/Wire/Wire.h
+++ b/libraries/Wire/Wire.h
@@ -37,8 +37,12 @@ class TwoWire : public Stream
     TwoWire(SERCOM *s, uint8_t pinSDA, uint8_t pinSCL);
     void begin();
     void begin(uint8_t);
+<<<<<<< HEAD
+    void setClock(uint32_t);
+=======
     void end();
     void setClock(uint32_t); // dummy function
+>>>>>>> arduino/master
 
     void beginTransmission(uint8_t);
     uint8_t endTransmission(bool stopBit);