Remove conflict from paranoia_test