Pull conflicts in and merge on stage.

Shield from anonymous voting.