set production/staging password
resolve conflicts
messaging tool full implementation