Resolve conflict, add 21.