You can ignore the conflicts below, as they are because Git can't find ancestry properly here :)
« Back to merge proposal
You can ignore the conflicts below, as they are because Git can't find ancestry properly here :)