'UserSettingsPrefs.cs.meta' conflict has not been resolved

[hixuzhe]

content:

fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Package/Editor/Helpers/UserSettingsPrefs.cs.meta
guid: fad7572312c85da4e80e115c63b2d164
========
guid: 267c04a3d47600c488137859ea7af2a9
>>>>>>>> develop:Assets/Package/Editor/Override/UserSettingsFileMainToolbarElementOverrideRepository.cs.meta
MonoImporter:
  externalObjects: {}
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

[Sammmte]

Hey 👋 thanks for letting me know. I'll update soon.

[Sammmte]

Should be working on version 3.0.1. Pls let me know

[Sammmte]

So sorry, didn't actually resolved the issue on 3.0.1. Please try version 3.0.2