Combine Clients; Files always copied whether option checked or unchecked

When Combining a Client that has Files, the Files s were always copied from the redundant Client to the merged Client.

This should only happen if the 'Copy first Client's Files?' is checked.