I lean towards merging as is and fixing afterwards. Or doing a manual merge locally, fix whatever needs to be fixed, and then push to master. There is just something about changing other people's commits that doesn't sit well with me. But maybe there is something about the author/committer feature of Git and how it's intended to be used that I'm not understanding.