me dislikes conflicts... and paws resolves them! or tries
Signed-off-by: Antes <antes@simplemachines.org>