parent instead of master. fix activity. updates