Add asset copying on build target.
Fix merge squashing in deploy target.