Twig can now merge branches with its own merging algorithm.

This was a really really hard command to get working. It was ALOT of debugging and trial/error but in the end it works really well and im super proud of it.

At the moment, if there is a merge conflict, you have to pick which branch’s changes you want to keep.