conflict changed back
Merge branch 'treebeard' into coverage