add merge scripts
preparing for merge
moving for merge
preparing for merge
renaming
renmaing
pieces for merge
merging