settings vc
pushing stuff
merging w/ updates