sml: split resolver from merger
agile: update clocks for sprint 29