ticker
merge conflicts