DAO car, DAO request
DAO car, DAO request merge
format DAOCarImpl
manual merge
DAOCarImpl source format