mmm, so I didn't actually solve the merge conflict :P

Signed-off-by: Suki <suki@missallsunday.com>