Enable accept all movement indicator suggestions
Fix conflicts