More workflow fixes for editTrack*
fixing conflict