Adding files after merge and build solution