tailored time down
merge conflicts