Added unitof work and repo updated
First conflict solved in scproj file