Revised accept all when declined suggestions are included
Fix conflicts