Make go get-able
Fix merge
Return clobbered files