[B.A.T.M.A.N.] [PATCH 0/2 net-next]: fixups for wrong conflict resolution