Finish merge of protocol subproject