FIX Removed merge_conflict in doc/whats_new.rst