Merge, losing branch names