Git merge

A git merge is needed taking a weird root though