Fixed merge conflicts with help modal