added track insert, remove. update ruler
fixed conflict