[merge] Fixing all the moved file by doing a rm -r on merger