Adding non-functional arduino code
Fixed merge conflict