Huggle:Cr-resolved-same-user/en-gb

Conflict resolved: reverted all edits including new edits, made by same users - edits are by same user: $1