devices tab added
conflict resolved