fixed merge bug (use keys from master concept level df instead of intersection), also added option command-line argument for easier running on home and work computers