Remove manual merge commits