resolved migration conflicts
fixed error 500 when no rules on db