CSProj files and remove merge leftovers