Change add server migration for staging env
Fix conflict
Fix add server migration for staging