Chose branch for conflicts but main branch overrode changes

Branching Bugs
1

  1. Describe the problem your experiencing and how your idea helps solve this
    I resolved conflicts in my branch by choosing the branch for everything, yet all my changes in my branch are gone and it matches the main file again.

    Screen Shot 2021-09-22 at 17.01.16
    Screen Shot 2021-09-22 at 17.01.161920×1200 89.5 KB

    Screen Shot 2021-09-22 at 17.01.36
    Screen Shot 2021-09-22 at 17.01.361920×1200 111 KB

    Screen Shot 2021-09-22 at 17.02.12
    Screen Shot 2021-09-22 at 17.02.121920×1200 97.6 KB

    Screen Shot 2021-09-22 at 17.02.24
    Screen Shot 2021-09-22 at 17.02.241920×1200 108 KB

  2. Add as much context as possible (screenshots, Figma files, mockups, etc.)

  3. Ask questions to bring the community into the conversation
    (e.g. Does anyone else experience this? Is anyone using a plugin or workaround to help solve this?, etc.