merge errors fixed

ethutil/big.go

@@ -62,6 +62,16 @@ func S256(x *big.Int) *big.Int {
 	}
 }
 
+func FirstBitSet(v *big.Int) int {
+	for i := 0; i < v.BitLen(); i++ {
+		if v.Bit(i) > 0 {
+			return i
+		}
+	}
+
+	return v.BitLen()
+}
+
 // Big to bytes
 //
 // Returns the bytes of a big integer with the size specified by **base**