Final merge updates