fix accidental change in resolving conflicts
fix accidental change in resolving conflicts
jashot7/openbazaar-desktop,OpenBazaar/openbazaar-desktop,jashot7/openbazaar-desktop,OpenBazaar/openbazaar-desktop,OpenBazaar/openbazaar-desktop,jashot7/openbazaar-desktop