Merge finished (minus most recent commit) into delivered