Fix for rsync merge to prevent hang