Change Automation nuspec file name.
Fix merge conflicts.