Added note on pull requests and  merge conflicts