all parameters automatically resolved
Updated zip with pull request code
Merge branch with automatic-resolved fix