Clean up merge conflict from Not.