add track files
fix merge conflicts