Conflict is the ... problem
Signed-off-by: Antes <antes@simplemachines.org>