Corrected merge conflict on SLN files