merged what should be merged