EU set to disentangle cross-border disputes