Adding source control part
Fixing merge conflict