removed main args
merge