Added solution file parser
Resolved conflict