Remerge tracking API
moved here