merge vast fix