Updated for 2013-01-28.
updated team
merge conflict
resolve merge conflict