merging back master state