Merge branch 'master' of C:\Users\Fred\Desktop\PROMAND\Project-1 with conflicts.
Merge branch 'master' of C:\Users\Fred\Desktop\PROMAND\Project-1 with conflicts.