Resolve conflicts in doc/development/limit_ee_conflicts.md and doc/development/automatic_ce_ee_merge.md
Signed-off-by: Rémy Coutable <remy@rymai.me>