Redid arduino code
Fixed expected merge errors