Clean up old merge cruft