couple quick changes
merge fix