Fix merge(to keep source clean)