solution merge

adding the solution to the repository