fixed merge in track