add cd setting
fix conflict