Commit message
fix merge conflict
Removing solution files to prevent future conflicts