fix db patch collision