tweaks to get deployment working
resolving merge conflict