Cleaned up the solution file from merge