Conflict detection code does something now.
Merge branch 'master' of github.com:morepath/morepath