delete spare merge conflict files
Amend test with 4th fix
cleanup
Fix 5 of test