added even more to intro
merge conflict? what merge conflict?