Made merge clean up after itself.