Removing incorrect "No Changes" after merge conflicts
Merge branch '2.4'