Fix a committed merge conflict and sort spacing on the feature menu.