If you get a conflict when syncing the branch with the master. First checkout the branch on your local machine and then run the following command to merge the changes from master.
$ git merge --no-ff -m 'Merged in master (pull request #40)' remotes/origin/master
Then manually resolve the conflicts before committing and pushing again.
