Fixed csproject after failed merge