Direct merge freezes sidecar

when i try to finish my feature session and merge in the changes locally sidecar gets frozen on this screen

<img width="529" height="300" alt="Image" src="https://github.com/user-attachments/assets/cf0e0f06-2c61-4405-b3ce-a23aeaed9db3" />