Only 1 proximtyUUID needed
Merge remote-tracking branch 'origin/master'