Merge latest VS files from main project