20131216 Update Protocols
fix conflict.