uj sor added.
solved the merge conflict
Notes added
Merge branch 'team_1'