Solve conflicts of rename daoFactory on my commits Again