Edits to hardware.py
Resolving merge conflicts