fix the conflict :)
Signed-off-by: Antes <antes@simplemachines.org>