merge mrtino