updates: merge, and deploy!