remove conflict malarkey
added test-enable buttons