saved the changes!!!!
merge pairing machine and my machine conflicts