Savannah's controversial gun storage rules are now in conflict with a bill heading to the governor's desk.