merge

Author: cedricvincentcuaz

RELEASES.md

@@ -5,11 +5,8 @@
 #### New features
 - Implement CG solvers for partial FGW (PR #687)
 - Added feature `grad=last_step` for `ot.solvers.solve` (PR #693)
-<<<<<<< HEAD
-- Implement projected gradient descent solvers for entropic partial FGW (PR #702)
-=======
 - Automatic PR labeling and release file update check (PR #704)
->>>>>>> 1fa685a3185072e6a4de31202661876db5fa9a50
+- Implement projected gradient descent solvers for entropic partial FGW (PR #702)
 
 #### Closed issues
 - Fixed `ot.mapping` solvers which depended on deprecated `cvxpy` `ECOS` solver (PR #692, Issue #668)