Changes for arduino
Fixed merge conflict
Fixed some warnings in arduino