merge and consolidate changes
deploy to local