level 3 + incremented dream and city state
merge conflict