fixed weird merge metadata causing VM failures