You could merge the feature branch into master (or whatever), resolve conflicts, commit, push and deploy.