Whats is the difference between "federal question" and "diversity cases"

The courts shall have jurisdiction over all disputes in which the State shall be a party, conflicts between two or more States, disputes involving citizens of different States, and all matters involving admiralty and marine jurisdiction. Any legal and equitable disputes resulting from the application of this Constitution, laws of the United States, and any future treaties will likewise fall under the purview of the judiciary.