Fix more merge issues and change Build-Solution to mimic CI