Merge2

Renamed all 2 to normal name and added .bak to the originals