Fix typo in avrdude and atmega class names
Remove extra line from merge conflict