Fix conflict when a user was reverting the latest patch from someone else
Fix conflict when a user was reverting the latest patch from someone else

xwiki-labs/cryptpad,xwiki-labs/cryptpad,xwiki-labs/cryptpad