Small changes to deployment scripts.
Resolved conflicts.