Fix pushing of merge commits