fixed merge errors in arduino code

not sure why merge was so screwy