second dev
conflict res