dev 1
merge res