$ git pull
pull is the same as fetch+merge, but it is probably better to do it in two step. First fetch and then try to merge.