fix(merge): allow merges of new folders with the same name (#61)

fix(merge): allow merges of new folders with the same name (#61) #106