merge conflict and fix for mounting again a device that's already mounted