The conflicts are simple enought to resolve that we don't need to bother
developers with those.

Signed-off-by: Rémy Coutable <remy@rymai.me>