It's not your fault - the app should do better. Currently, if the changes 'touch', GB treats it as if they intersected... which can lead to this kind of confusion.
Soon the app will allow partial committing (vid below) & it will be possible to handle this better. Thanks for being patient with us! 🙇♂️