working on new activity
merge