County commissioners approved a $6 million land swap today with a local school district. The two have been at odds over plans for a new county jail.