City of Bryan merges CFO positions