remove pointless pending tests
fix merge conflict