code merge

fixed conflicts