merges from desktop