changes to sha generation and replay merge behaviour