adding solution and projects
resolving conflicts