fix merged