conflicts xdvik
