Add stub for handle conflict method
nitpicking