adding first commit of track merging, this will be updated