Clarify merge options
Clarify merge options

vector-im/riot-web,vector-im/riot-web,vector-im/riot-web,vector-im/riot-web,vector-im/riot-web,vector-im/vector-web,vector-im/riot-web,vector-im/vector-web,vector-im/vector-web,vector-im/vector-web,vector-im/vector-web