Found another merge conflict (two UCs had the same number) and resolved it