Initial team2 commit
Resolved 1st conflict