Remove debris

Remove debris left behind by diff3.