Discard local settings and use the ones from the xml file (misc.xml)

I've read that the whole .idea folder should be under version control, and that's what we're doing. However, we all seem to have problems with that, as our local Intellij overwrite our files. For example, mine inserts assert-keyword="true" jdk-15="true" in my misc.xml, in the <component name="ProjectRootManager ..> element. Also, the mere opening of the code style settings tab now creates a codeStyleSettings.xml that is not versioned. My question is how to reset my IDE settings for both of these issues? How can I tell Intellij to respect my files and not it's settings?