Git conflict log

 I have somehow messed up my autogenerated git commit message log in PyCharm. When I do a merge with conflicts, the default setting is supposed to show the conflict log in the commit message for me it now always shows the last commit message. Does any any know how to revert these settings to default?