Fix merge problems with VS