when you try to merge it you will get collision - our root is to 'reviews#index' ... you need to switch to master(git checkout master), update it(git pull), switch to you branch(git checkout name-of-branch) and then git rebase master ---> git will show you in which files there are conflicts, you need to change them manually in editor