Clean up temporary artifacts on merge