can now read file from args
fixed merge