updated statemerge files