Delete scope_settings.xml

Delete vcs.xml

Delete modules.xml

Delete misc.xml

Delete magicento.xml

Delete frameworkRootSettings.xml

Delete encodings.xml

Delete dataSources.xml

Delete dataSources.ids

Delete codeStyleSettings.xml

Delete application.my.iml

Delete .name
Merge remote-tracking branch 'origin/master'