Clean up files after the merge