Nothing stops you from doing both renade and merge commits.

Except perhaps crappy gui options in GitHub. I really wish they added that option as a button.