Merge branch 'master' of D:\projects\team1 with conflicts.
graph