breaking out stars
merge conflicts