Refactor merge commit (more options)