fixed in other branch
adds acros
conflict res