---

Linux adopts conflict resolution code

The Linux development community now has an organized way to deal with the eternal problem of developer conflict.