Toward Beta 1
Resolve conflicts