Support automatic creation of merge commits
Revert "Support automatic creation of merge commits"

KISS