Resolve protocols before merging