python script for merging, moved master to x folder until complete