[cmaster-next] [PATCH] zebra-mpls: fix regression caused by wrong conflict resolution