add Arduino Nano
fix conflicts