I am doing a merge and I got into a peculiar situation where I need changes in A and I also need the changes in B. Is going into Window 3 and manually editing the variants the proper way to go about this?