I have a quick question about git style. When I update the pull request to include the above changes, should I do a merge (which will cause a merge commit) or should I force rebase to keep a neater history?