updated stuf
merge resolved