Handling weird merge from iPad to desktop...