Other changes about merging