Some tidying.
Merge a baffling confict