learning-demo This is my first Git Repository Author- Bikiran Mondal(Rashmi) This is an example to creat a merge conflict.........