latest maptf from dho
resolved conflicts