timeline slot menu changed
merge complete