merge from desktop