This is the base commit.

This is common for both branches. In the next line, I will write the branch name. main In the line above, I will replace with the name of the current branch in each of my two branches. Because each of those two branches are directly from main, I won't be able to merge one into the other directly without a conflict or so I think. Lets find out.