There are two branches: `branch A` with some files and `branch B` with for example folder named `FolderB`. When I merge branch B into branch A there is no "FolderB" in staged files in commit. This is an unexpected behaviour for me. I remember that several days ago before this merging I did another merge that finished with conflict that I resolved by selecting option `keep ours`. Maybe this option saved in somewhere and now it does side effect. If yes where can I delete these settings?