Added conflict? method