Or/and in brackets
Merge conflict resolved