merge pull
fix merge conflict
merge and invocationGen fixes