Change firmata comments
some merge nonsense