Clarify rules
Merged conflict