Merge endofstate changes