add something in master branch
merged new updates in origin/master with git pull, and handled the conflicts